Bugfixes for calendar mapping, expanded dummy data, serialization fixes