Command Line Arguements, Cleanup, Bugfix