Fix some comments for the changed functionality