more C changes