improved stuff for pip