merge with master
merge w master
merge w master
Update TODO.rst
Update TODO.rst
Update TODO.rst
multiple cleanup & fixes
merge w precise
merge w precise
merge w master