adjusting to make it fit stuff
scripted update of code from master at 4fe133a adjusting to make it fit stuff