Updating DataTables

and some bug fixes