virtualenv update
some merry refactoring