Better Strings

<3

Change-Id: I36e59be09c79a86fa8a492aae7708d3d094834f2