changes made by Keith

Hopefully I got everything.