A few final comment changes...