speedup and fix pip deployment