fixes on PCLOC generation, intermediate node insertion, etc...