Lots of small changes collected over months...