replaced basically everything

Spacing change, plus a lot of tweaks and fixes for stuff that either
wasn’t complete or didn’t work. Still sooo far to go.