uuid fixed
split output step 1
small adaptations