Little changes for the perf' and correct of bugs