Fixes
Fixes
Improvement to strings