more fixes and such