String changes

includes Nikhil’s changes