kp's fixes