add kvpair and nodeinfo types; update todo