Update some strings, and merge jb43 into hlv