Added Sigma and Phi and fixes