Second level of scans hierarchy
Introduce canonical forms of variables
Fix links in messages
Fix canon