Spacing and bugfixes

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