Fix few mistakes, add some todos