Replace Sigma in definition of Z to match P&M and fix mixing of generator directions.