comments and minor changes.