Merged GUI and Console Version
minor bugfix
minor fixes
minor fixes
fix
fix
fix
fix
fixes
fix