try to solve some todos