renamed the c stuff, broke two problems.