BigFixes

Lots of bug fixes.