minor fixups
more changes