more fixes and prep for API