ENH: write more output per site