ENH:Added tightening of constraints to estimation code