some minor fixups, etc...