Add timestamps and file sizes
Merge remote-tracking branch 'ben/master'
Finished change requests.