+ quick tidyup and fix the worst bits