added missing punctuation, more detail re: date/time
fixed merge conflict
fixes images