update string handling slightly