Fixing string stuff still