Added some todos and clarifications