further simplify report class, and fix html report