Tweaked parameters, bug fix