Creating POM
Bugfixes and refactoring