bugfix
change default params
code cleanup