cleaned up a little bit of code. ;)
Merge branch 'guiupdate'