some more yet
scripted update of code from master at d28b0bd some more yet