added a bunch of things.