Added small todos