Added/fixed code comments