major commit

Bug fixing, grapple updated again, typename being serialized fixed