kni: various changes