fixes and API prep