- yay, fixed me macros and found a new bug!