A series of annoying changes to String Parsing Code

Heres all the changes to the string parsing. It may need complete reworking.