Improved command line options, removed debug output