merge revisions i missed... hopefully not breaking things - did not check every change.