many updates and fixes for PI pages