Add additional options for API methods

And some other little fixes :)