* cc fixes, gamma armoury changes * reverts the fixes * how did these change, who knows, here's a revert anyway * merge master * what the hell am i doing, i dont know * fixes weird lathe stuff