updated code to (hopefully, testing now) support the claw and such