m3a1e2: fix tabs and diagramming
m3a1e3: fix tabs and layout