Lasted fixes and changes after few experiments.