Minor changes and additions