[] fix up more definitions
[] Fix up commodity defns