You're a hero for commenting this. I know it is so late, but I actually did go back to this project and shoooould be fixed now >.>
Yes, that's much better. Thanks!