minor changes to hChoice()