Fixed some bugs, updated to latest tox.