added q3-5, fixed Q2, minor changes to Q3