Some readme/todo changes