Add comments
merge fixed pom.xml