Minor tweaks. Add ability to specify version via command line arguments