bunch of little changes