Add wip cegs
Fix unneeded ceg tags