changed order of serve customer constraint to be consistent with report, some bug fixes