Options for methods added back

Moved option settings for each method to a function _setOpts to clean up
the code a bit, renamed several option variables and provider variables
so they didn't conflict.