more gathering fixes
a
Merge remote-tracking branch 'origin/master'
fixes for stefan's fixes