Some finbugs fixs, and pom simplified.