String changes and general fixes.