Fixed comments to reflect recent changes in the code