Final commit for report
Adjustment of some logic
Added Javadocs