comments and minor changes