More minor improvements to q1