A butt ton of fixes
Merge branch 'fixalot'