fixed some timestamping issues