Fixing all the files so they act as they will in the final iteration