There are several FIXMEs, most of them related with common refactoring as @frbattid and me have been discussing at skype. They are not to be addressed in this PR, but in a later one.

NTC (just informative)