added lots of stuff, including tox