Some minor fixes to the consumer choice device function. Still broken.