Modifying the pom and some comments