etl

43d16b10 - Adjustments to code and optimisations