fixed up output of swig
more fixes