Oumafan for all that effort

I will have aproper look later and make some comments