some borders now that are correct
scripted update of code from master at c8ccf91 some borders now that are correct