review comments & pom changes