Some touchups preparing for SoCG.
Committing everything