realligned PNPros with the groovy version
fixed some porting bugs