Switch/Optimize week assignment, improved constraints