Added date field, and cleaned up some errors