Update dependencies, refactor PA -> OC, small aesthetic changes