Fix command line, add version numbers