Changed some wording and map annotation colors