a few minor changes;