updating with name corrections and comments from testing