Changed configurations, solved some issues, added javadocs