rename a few things, minor changes