Update todo and patches