GUI enabled - minor bugs