tidy up and fixes
bump v