better make_up
fix bug with reports
fix reports bugs