Various fixes.
Merge branch 'development' of https://github.com/henke101/Mindy into development