Incorporate comments for the community

thanks to @coderanger and @yzl for these suggestions!