Minor changes and documents preparation