Improved API, Fixes