minor bugfixes, pixel pushing