final changes
corrections: no more DataRow!