Change if statements checking for null
Change date output