Rework

Primarily fixes and refactorings. Putting this up for separate review before I make any changes/additions. I suspect this might be hard to review from the diff, so maybe view them side by side.