Can we fix pidi+? i did pidi+ and minor fixes.

Published 2021-10-01