Added data interval time options and removal of inccorrect npoints line