lots of little changes