rename some things, make a better plot