fixed missing assignments
cleaned up template
Merge pull request #219 from rwarbelow/report_tweak

Report tweak