modified the strings so that they are propperly displayed
merge