Minor wording fix
Miscellaneous improvements
Fixed names