Fixed some string after discussions in community