Add remaining fixes needed to get predictive timer working

This patch adds the remaining bits needed to get the timer working.
It also makes the debug output easier to read.  W00T!