Types update

Included Types and Constants file.
Change names of all types and enumerated elements to reflect the
documentation.
Minor changes in screen output.