Minor changes and update