lots of little changes to mr