changing some constraints, fixxed some cart bugs