try1
More fixups