Update man page with missing or outdated options

The options have also been moved around to match the -h/--help message.
Update -h/--help message to match the man page