Suggestions for pr1

Some suggestions for rapid7#1