bump version and some tidyup