various fixes
Merge branch 'master' of github.com:Nixhatter/CMS