fix optparsing and cleanup help output