just tweaking things
now using the simpler diff format
and now we're building up a visual tree better