Fixes several issues with the API. Resolves #349