reed solomon changes and header fixes
fix merge conflicts