Merge pull request #575 from brooksryba/develop

Styles and bugs. The usual.