minor adjustments and comments