Significant improvements, mostly concerning the inaccurate timestamps