added string stuff
fixed stuff