several changes suggested by Kevin