Fixing up small tidbits. Need to cleanup quite a bit of wrench code