Some new defs and edits

edits mostly for consistency of capitalisation of defs