TP1 q8 done, and bug fix TP2