Add options, man page and cleanup