Refinements to 1.2.2;

Almost lockable;