More todos, permissions updates