pom fix, cleanup, etc