reworked some comments