Various small changes, and some comments for Richard.
Merge branch 'master' of github.com:RichardEvans/EL