choices: Minor fixes, comments