Clarifying some comments
Correcting invalid use-after-free error