CFY-516 added initial tox support, some get tweaks as well..