p2s connector update and various fixes