Enhanced logging

Continued redesign