More comments and better date handling.