A couple of improvements and hyphens