adding a few things suggested by NH.