migrate Calendar
some fixes