Remove debug option, fix command line options