etl

86edd1a5 - Adjustments to code and optimisations