calendar added, bugs to be fixed