header fixes (unfinished)
Merge branch 'master' of https://github.com/otech47/STREDMNEW