n&n: optaplanner improvements etc