Clean up date handling a little; output '-' for invalid dates instead of the current date