Changing when a service is formed.
Merging files.
Fixing some errors