General tidying things up (fix typos, etc.)
Update copyright
More tidying
More cleanups that I missed earlier.