Added some fixmew/todos