Added pluck to make a map select faster
Corrected bugs