more fixes and stuff.