Minor changes and a name change