1. Fixed an issue in the datamodel generator regarding collection values
2. Other bug fixes regarding updating of stations and their distances