Minor improvements, after viewing at github.