Minor tweeks as I read through it again.