More improvements to gathering.