Fixed bugs - converges properly now