done most of report and fixed a few bugs