a few fixes. Won't ya just work now?