more fixups and changes