Minor improvements and a few additional comments