Several fixes after beta testing
Merge pull request #120 from HappyMelly/fixes-after-beta-testing

Several fixes after beta testing