Several fixxes
Improve datatables & fix code