Work in progress
Pom fixes
Tighten up code a bit.