more op fixes (and more ops)