re-revert changes to reservoir, fix tasks.py