more fixes on canonicalization and progress