Bugfix in DEBUG mode and change of default parameters.