updates to fswig_hklgen.py