Make data table nice and correct (and some other addiztions)