++ Map pin logic and bug fix