A few improvements

Commit's names are self-explainatory