restore earlier contributions by Scott

these were lost in the shuffle with his ill-formed pull-requests