more fixin
scripted update of code from master at bf052d1 more fixin