More consistent comments (Fill)
More consistent comments (Datum)
Added NaN exceptions