nkb: updates from local