Fixed some todos, turned some into tasks