Think I fixed the bugs...