Added DataTables, minor improvments