Fix option switches and minor changes.