John Pasula:
	- ToC Update.
	- Add Zeglar's fix (thank you!)
