even more rc and header changes