Lots of small little changes