little modifications of generator.py and tango.py, big one on htmlgen.py