Use new timestamp and add record index to header
Whitespace cleanup