Some new defs and edits

edits mostly for consistency of capitalisation of defs
Merge pull request #22 from kinglouisxiv/patch-4

Some new defs and edits