fixed convergence issue, added some old stuff
tweak