Added verbosity, include paths, and using getopt

Not really worth doing (not worth undoing now either)