Redid canonicalspace
Fixed bugs