Resolved some TODO.