manual tool change fixed.  Macros for touch probe renamed, tested, working.