Chris Heald:
	Fix embeds, remove cruft
	Add pkgmeta
	Tweak options a bit
