cleanup, api updates
more cleanup