Portable Ops 2: Update - p90fix plus more optimizing

Update - p90fix plus more optimizing