various touch ups
Merge pull request #334 from arlolra/fixes

various touch ups