fixes (so many of them)