a bunch of little changes