pom.xml update
misc changes