added/fixed some comments