Fixed some todos
tasks