Trieing to fix them still, added some debugs