Fixed calendar, added better error messages.