added a bunch of little changes