Some fixes and adding the ability to unite files