Latest changes

Some changes to edit strings and such