bugs corrected for datatable integration