String Edits Part 3

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

PS2: Moar better for Jonathan <3
PS3: Well that was annoying...restored initial changes and made a few more
PS4: Missed one
PS5: Rebased
PS6: Moar edits
PS9: Bring signal title inline
PS10: minor adjustments

Change-Id: Iaea57ce6c8d4288087d52a2a19a51a1cc5896df4