minor changes in comment model