more fixes, i think a bunch of stuff is screwed up