improvements and switch to report class