Fixed some things, and added in blha303's changes to the pom.