DEFINE CONSTANTS
More Fix + Defines
Merge branch 'Dev2' into 1.4b