Kf small design changes

Working in the wrong branch. Doh.