rename a bunch of stuff and add some notes