Adding some alignment merging
Changing argument structure to be more friendly to file globbing. Also trying to cut down on console spam