refactoring

Added several new global parameters and deleted function calls "deprecated"