Numerous additional contraints for factors

Next...