Updated some names, cleaned up some things.