more choices fixes