Add in missing strings

Omid's work was based on string redux branch, so for now just add back
in missing strings. We will eventially remove those strings everywhere
but this gets it throiugh the Travis tests.