added more constants and clean exit for non-existant identifiers