Minor changes and refresh