Some updates based on a review from Bjorn Reese.