Bugfix/text blocks

includes the changes from the last pr related to text stuff