bug fixing
add some parameters as settings