more cleanup, pagination, reports