Removes forgotten debug messages
Adds comment options for command line tool