Ok, will do that after merge since its impossible to read this here.
I guess I will review everything with Dino once we dont change anymore