shortened constant names. added more options for compounds