Misc cleanup including adding the version number