Add UW decomposition; took out the incorrect extra k_(i,i) and p_(i,i) variables