A few minor adjustments and comment fixes