General clean up, add log message collection