Christian Weeks:
	- Fix ticket #2 (no such global)?
	- Fix TOC for disembedding
