rewrote some comments