minor changes and pom fixes