Yes, you are right, I was off by a factor of 1000, must have typed '000' one too many times. Sorry.

Also, yes, the TWh was a per year amount.