Fix version information
Fix command line options
Update version information