Ok, it's a while that I don't commit

Many changes. I might also have messed up a bit up with git  (I forgot to rebase). Merge with caution