bugfixes and parameter adjustments