Add report and some code improvements
Refactor
Fix biblatex useage