last weeks changes tyyyp
fixed conflict in tnm034.m