Improved verbosity + added forgotten file merges from old script