Update POM and Bug fixes