Fixing parameters in the config files
- consolidation of code part 1.0 done