Tweaking of some default parameters and handling. Current segmentation is improving.