Worked on report and some housekeeping