Refinements to 1.2.4;

Can be completed;