reworked a few comments