Fix more bugs, more accuracy