More of the requested changes

I hope that is all the requested changes.