final batch of logging additions