A few fixes + a mind map