small bug fix and parameters change