some cleanup, plus added Kisarafu node