Additional comments and minor changes