Removed some of the options.
Cleaned up error messages.