Compatibility Update and Big CB Overhaul

Mostly updating for comparison with the latest beta patch. Also the Big
CB Overhaul got into it.