new modules
cosmetic
bring in agrement with local
moving localvars to module
commenting out some modules