even more fixup, created more mess than planned