Bugs with options fixed to allow saving.