add stations to map; other changes