more fixes and stuff..