Added lots of string stuff