Updated cc files
Merging some patches (infinikiller and gamax!)
More fixes