Add last few todos I can think of.