Fixing string treatement bugs
Actual testing (not as intended)