Add options to the methods.
minor fixes