Merge of many repo and some bugfixes

Merge the changes from :
- @kossi
- @BoboTig
- @kiffes
- some others i don't remember.

And some bugfixes on my part.