Add swig to list of test_install cleanup items.
Add @s0undt3ch provided fixes, many thanks.
Add name to header.