upgrading poms & minor improvements