fixing todos for usage