More comments and minor changes.