comments and minor additions