Fixed 2D hist bug. Implemented new CCT generator.