Filled in remaining constraints
Fixed constraints using made up notation