some more fixes and stuff.