Fixed some ms loops
Fixed some ms loops
Getting through @TE macros