tweaks to ben's
Merge remote-tracking branch 'upstream/master'