Global reorder :)
Restored original parameters in constants.py that were "lost" during debugging of
last major changes in code