Spring cleaning

Also resolves #54, #57, and #58.