still some fixes to do