lots more fixes, and such