more fixes and such (also 96->256)