minor fixes to report
managed the pictures in the report a bit
fixed conflicts