change text and fix a bug