murged changes from original calendar and some bugfixes.