GUI appears to be working now, minor bugfixes for upstream code
Authored by: nabber00 2010-01-17
Parent: [r521]
Child: [r523]