Print correct version number
Cleanup
Improved help message