Various Cleaning, Logging Improvements.