Fixes to Psalm headings
Fixes to versification merge