minor picking improvements