Modified a number of files. Uniforming logging messages.