fix alignment
fix, create counter to avoid duplicate filenames

TODO: this is a hacky solution, need a proper one!