Added some better commandhandling, few GUI Changes