fixes, etc (and a test pull request)

This is a pull request comment.