more rc and header changes