fix multiple issues during testing
Merge pull request #2 from hdb3/simplemode

fix multiple issues during testing