Various Updates

I think these are sensible, I've tried to stick to the 'bare minimum' philosophy whilst being helpful. Please see individual commit messages for more detail.