Use upstream p-s, bump deps