wip
update API and comments for godoc