0.6.1

Style fixes, small changes, and cleanup before a big change.