updated controls, added static vars from enums