Remove some things, add some others. nothing too important.