FIXING up a bunch of things.