Added headers macros to these files
Minor Changes
Corrected code for adding second constraint