Is ok now?

I think I make a mess in my git history ... sorry if it is bad again.