Fixed up map and added index.