fix few bug + change text