more typos -.- + forgotten diagram
Merge remote-tracking branch 'origin/work' into work