Fixing up strings; this appears to be working.