Style fixes
Added the two new options to the command line
Removed hashbang, minor update since we are now using underscore