Update for PL

Some tweaks and correction