wip: sources review (to be continued ...)