Listed constants that should be defined and fixed some inconsistencies.