Merge branch 'master' into Geoffs_WIP
Descriptions

I added some
Merge branch 'Geoffs_WIP'
Merge branch 'Matts_Work'
fixed tiny errors

forgot to inflate lung1. Can't save the universe with one lung.