random improvements, largely for the supplement