Clean up of older comments and minor additions.