some tweaks, added TODO.rst