cleanup
multivar fixes (part 1)