fixed some headers, some comments