cleanup, pip fixes