A few changes to match current spec, plus fudging for Niecza.
A few changes to match current spec, plus fudging for Niecza.

bitrauser/roast,b2gills/roast,cygx/roast,laben/roast,dogbert17/roast,niner/roast,laben/roast,dankogai/roast,dogbert17/roast,zostay/roast,skids/roast,bitrauser/roast,b2gills/roast,laben/roast,skids/roast,dankogai/roast,niner/roast,perl6/roast,skids/roast,zostay/roast,cygx/roast,cygx/roast,zostay/roast,niner/roast,b2gills/roast,dankogai/roast