Improved a few comments