mstd code review
Forgot debug output
Update to mstd_review