Optgroup note, link fixes, other ...