comments have been placed where bug has been fixed