Added some misc todos