NaN data

Solutions for all problems with data