changed 'delete' to 'archive' for removal of timestamps, a few minor style tweaks and fixes