several small fixes
Merge pull request #30 from specgrid/general/small_cleanups

several small fixes