fix ipc behaviour & actors pick - code cleanup