virtualenv support, various improvements