WIP updates
Merge pull request #29 from wvmitchell/quick-fixes

WIP updates