fix report template
move parser to new class
spell fix