added comments
changed date to timestamp
changed date to timestamp