More tiny tweaks. Actually make the canonical path mean something.