- Merged in Aaron's recent refactorings and tweaks that he accidentally did in old repo
Formatting fixes