Add comments and tweak output.