OP-1317 Bettered jump treatment in yaw calculation and some cosmetics