merge #1; more infog and links