Quick tidy of ms, add in last of the recent changes