ENH + FIX: addressing discussion + add picked data