Minor adjustments and commenting