minor fixup
several fixups