Fixed a typo
Reorganised options code