version and more cleanup