minor changes
Merge branch 'gui-development' of https://github.com/lyckade/xpstart into gui-development