remerge some changes

e.g. the link to a calendar file got lost