began mavenizing and back bugfixing