Moved creation of headers into write822Header and some code clean up.