fixed some more 'fixes'
Merge branch 'master' of github.com:Wolframe/Wolframe