same string + minor fixes