Added lots of constants, and choices for some fields