Add more logging
Change output name generation, this needs a more proper fix