Major logging improvements, disposal order fix