Lots of small detailed changes.