Merged constants back into main file. Syntax errors corrected.