Fix the parser, define types and change descriptions
Fix the parser, define types and change descriptions

jason-neal/equanimous-octo-tribble,jason-neal/equanimous-octo-tribble,jason-neal/equanimous-octo-tribble