Use the now variable consistently everywhere

This will help ensure that dates are in the same format everywhere.
Include the unit in time-based variables