Grapple and attack fixes

see readme for complete list