fixes - more of them
Merge pull request #8 from BenBals/dev

fixes - more of them