Fix of small bugs
Merge branch 'master' of github.com:TeamWraith/WraithQuest