Major improvements!

Search added, pins drop at proper locations, happy John!