checked in some todos