Changed/added some logging info