kmap: comments and cleanup