Merged Massy's Changes

I merged 'most' of the changes (except for the title, its mainly
category theory right?). I didn't read through all the changes carefully
(its nine pages :P)