Updated to deal with timestamp properly, and improved docs.