Some cleanup and NaNs