Lots of fixups on timing code; additional output