changed the deadlock and some textfixes