Fix crashing when changing options repeatedly
Bug fixes and looks