moving to mvn builds, minor changes