merge in changes from 2.0 branch; fix byte counters in accounting records, add gigawords