Small GG changes + Grapple fix