Fixed calendar and clock issue, will work for a prettier fix in future commits.