add a note and tweak some output code