modififed timers for faster timing
various fixes to ensure new form of data logging continued to work