Changed/Fixed Logging a bit