resolved some errors
Merge branch 'guiImprovement'