Added a bunch more options.