Options now update instantly and OptionsState lokks a bit better