Harmony text

Some small changes to improve text handling. Will need further mods before merge.