Various improvements, some logging