Added DCMP handling and other stuff I can't remember