pushing up all misc changes. cleanup of pom as well.