Changes to pom. Added some thoughts as TODOs.