Fixed some comments
Merge branch 'dev-gui' into dev