Finishing up validation / NaN