and a little more of hte same
scripted update of code from master at a843067 and a little more of hte same