Fix highlights; add circle geometry; add access to pin points