Hi @Nortech ,
The macro looks great!
Below is a post on macro debugging using the Debug Resource and breakpoints. You can set breakpoints throughout the macro and add watch variables to see which values are being populated.
I think this will help speed up your troubleshooting process.