Updates to pom and some fixes