Various bug fixes for last push
Merge pull request #115 from LandonVance/master

Bug fixes