string fixes take 2