bunch more fixes
bunch of stuff... squash later