Improvements, texts changes