(at the moment the tree control is still entirely rebuilt,
 but now it will be easier to fix that)
 + coding style fixes