Added --help output, cleanups, etc