Data-val bug fix, headings refactor