more fixes and stuff