Added verbosity, include paths, and using getopt

These are trivial to fix by hand.