Fixed todo and some strings