structure and textfixes