Made more changes across files.