Updated readme
Changed some todos