Added new options, fixed existing, added OK button