General: Fixed Tinkers @Mark-R-Github please look and fix some of this