minor cleanup, revert if broken
latex report template
merge fix, hope it still works...