small corrections for strings
Merge branch 'development'