Updated POM; tackled a set of TODOs in code