Some refinements for factor

Allow locking (visually) of operations until can be applied