Fixed bugs, better accuracy.