Update with texts and fixes