Updated TODO and CHANGELOG, v2.0.0 release