Added commandline object and settings object
Improved GUI