more choice tweaks