So many fixes. Seriously, it might completely work now.