improving picking ... still bugged
fixed merged with windows version