Annotations

Ok, it was fine to review it. (I got rid of the macosx mods which are not linked to the compile -all- task).
Windows build should be ok, I don't know for Linux', at this moment.

cu next

broumbroum23