include meangnful basal definitions

Also tweak the others to be workable with the parsers.