small todos and stuff