Re-added TCon module and other fixes
Commented out AT entries that (appear to be) no longer needed.