Made changes to the way logging was handled.