more fixups, still not working