Handle NaN case correctly when multiplying with a ZeroVector
misc edits