more debug
scripted update of code from master at f33cfe8 more debug