more fixups
updated