Several improvements in texts