Fixed todo and stuff with previous commit