logging improvements?