Fixed options not saving, minor changes