Bug fixes. Seemingly Compute_Omega() is wrong