NA and plot improvements