Added some COMP fusion code. Fixed a few demons.