FIX : first round of comments
FIX : make tests work