Updated pom, minor bugfixing