Pick and choose problem and minor tweaks