added some todos and notes all over