Fixed generate_headers.py machinery on py3; More fluid surface tension injected

Signed-off-by: Ian bell <ian.h.bell@gmail.com>