MORE CONSTANTS and bug fix