Rather large commit, lots of things updated or chaged.