table stuff fixed