PL: Update + Many fixes