String Edits Part 3

I'm sure plenty of you are raging right about now...

Patch Set 2: Moar better for Jonathan <3

Patch Set 3: Well that was annoying...restored initial changes and made
a few more

Patch Set 4: Missed one

Change-Id: Iaea57ce6c8d4288087d52a2a19a51a1cc5896df4