Fixes and new API