Added time stamp, plus some other changes