- some minor re-arrangements of pom