Added virtualenv, minor updates