Fix version number in pom
Do some housekeeping