Changed some stuff around in delegate, made some things more streamlined, updated to latest tox core, some other stuff I forget.