A few fixes, still not functional bullet collision