hg-7 fix ToC animation and generally tighten up ToC experience