Add nokinds. Other wibbles.
Update to nokinds stuff.
Cleaning