Fix, now it compiles (yes it does !!)

Comments where there are some changes (except for trivial ones)
Temporary fix, made so that it will compile.