slight mod to data recorder macros, and bug fix
fix
branch merge