Improvements
Little changes on strings