Various minor additions