redid collision detection... again

and other fixes
nan fix
ehhh slightly better col dec
col detection works great again

on positive coords anyways