Expanded a few comments