Syntax fixes and work on the API.