Removed some dependencies from POM
Small bugfixes