Revision 1

Various small corrections, and additions. Should contain nothing controversial. 

Can somebody please review and merge if ok?