Substituted modules for global variables.  Improved user interface.