Fix reset bug and ground overlap bug