colision improvements... still not done -_-