roxygenization (almost) finished, still some details to be sorted out