Lots of smaller changes