Fixed a few bugs, simplified options.