6.0 additions

Tidyup and a couple of additions from Daf.