small modifications and cleaning to q6, etc.