multiple cleanup & fixes
Update TODO.rst