picking bug fixes and tweaks