Spacing and bugfixes

Didn't retab this very well and hit a few bugs with more extensive testing