updated/fixed build for maven 3.x
minor clean up and fixes