Some additional notes reflecting recent changes