Significant improvements, mostly concerning the inaccurate timestamps
undid buffextras changes.
Merge branch 'master' of git://github.com/Riamse/tools into Riamse-master
Merge branch 'Riamse-master'