bugfix && renaming of some params