Update including fixes and API