Picker debugged, minor code polishing