Fix a lot of things in q1 q2