clean up API, more coverage