change text and fix bug