Fixesonly

3 bugs encountered while working on options menu